From bbb426ce704a2d39d20e39cff92a55e690d9ddfa Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sat, 5 Feb 2022 11:05:39 +0900 Subject: [PATCH] cmake: add support for reproducible buildS We should use relative path not absolute path. We can use target without breaking reproducibility. This patch can be removed once MariaDB ships with Mroonga v12.00+ that has https://github.com/mroonga/mroonga/commit/27caeb9b8ce7fa432b1251eca475b517c6902a6c Origin: https://github.com/mroonga/mroonga/issues/298#issuecomment-1030815927 Bug: https://github.com/mroonga/mroonga/issues/298 Forwarded: not-needed Gbp-Pq: Name mroonga-mrn-lib-dirs-path-reproducible-build.patch --- storage/mroonga/CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt index 1538b6cc4..fe931a16a 100644 --- a/storage/mroonga/CMakeLists.txt +++ b/storage/mroonga/CMakeLists.txt @@ -222,7 +222,7 @@ set(MYSQL_INCLUDE_DIRS if(MRN_BUNDLED) set(MYSQL_PLUGIN_DIR "${INSTALL_PLUGINDIR}") - set(MYSQL_SERVICES_LIB_DIR "${MYSQL_BUILD_DIR}/libservices") + set(MYSQL_SERVICES_LIB_DIR) set(MYSQL_CFLAGS "${CMAKE_C_FLAGS}") set(MYSQL_VERSION "${MYSQL_BASE_VERSION}") else() @@ -261,15 +261,11 @@ endif() if(MRN_GROONGA_BUNDLED) set(GROONGA_INCLUDE_DIRS "${MRN_BUNDLED_GROONGA_DIR}/include") - set(GROONGA_LIBRARY_DIRS "${MRN_BUNDLED_GROONGA_DIR}/lib") - set(GROONGA_LIBRARIES "libgroonga") + set(GROONGA_LIBRARY "libgroonga") - set(MRN_LIBRARY_DIRS ${GROONGA_LIBRARY_DIRS}) - set(MRN_LIBRARIES ${GROONGA_LIBRARIES}) + set(MRN_LIBRARY_DIRS) + set(MRN_LIBRARIES ${GROONGA_LIBRARY}) if(MRN_GROONGA_NORMALIZER_MYSQL_EMBED) - set(MRN_LIBRARY_DIRS - ${MRN_LIBRARY_DIRS} - "${MRN_BUNDLED_GROONGA_NORMALIZER_MYSQL_DIR}/normalizers") set(MRN_LIBRARIES ${MRN_LIBRARIES} mysql_normalizer) endif() else() -- 2.30.2